(lisp-indent-function): Look for either

lisp-indent-hook or lisp-indent-function property.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f7d29dff72c21a74e6987bfd8d7dcea14866623f..f060563f17570947effe4473ece7d02f3b918e63 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -414,7 +414,8 @@ of the start of the containing expression."
       (let ((function (buffer-substring (point)
                                        (progn (forward-sexp 1) (point))))
            method)
-       (setq method (get (intern-soft function) 'lisp-indent-function))
+       (setq method (or (get (intern-soft function) 'lisp-indent-function)
+                        (get (intern-soft function) 'lisp-indent-hook)))
        (cond ((or (eq method 'defun)
                   (and (null method)
                        (> (length function) 3)